Andrew's git / gitweb.git / t/t4135/diff-with spaces.diff
?
t / t4135 / diff-with spaces.diffon commit merge-recursive: make "CONFLICT (rename/delete)" message show both paths (b26d87f)
   1--- post image.txt.orig 2010-08-18 20:13:31.544002255 -0500
   2+++ post image.txt      2010-08-18 20:13:31.544002255 -0500
   3@@ -1 +1 @@
   4-preimage
   5+postimage